Fix Windows desktop OS build version reporting#1441
Conversation
Use servicing-aware registry values so desktop telemetry reports the current Windows build instead of stale BuildLabEx data after OS updates. Files changed: - lib/pal/desktop/WindowsDesktopSystemInformationImpl.cpp - tests/unittests/PalTests.cpp Fixes microsoft#1407 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Refactor the Windows OS full-version composition into a testable helper so registry and Rtl build source precedence can be covered without depending on the host machine state. The new PAL tests cover CurrentBuildNumber precedence, CurrentBuild fallback, Rtl build fallback, and missing UBR formatting so future key or fallback regressions are caught before merge. Files changed: - lib/pal/desktop/WindowsDesktopSystemInformationImpl.cpp - tests/unittests/PalTests.cpp Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add a deterministic PAL test proving that UBR value 0 is still included when the source reports it as present. This keeps zero-value handling separate from the missing-UBR fallback. Files changed: - tests/unittests/PalTests.cpp Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
This PR fixes incorrect Windows desktop OS full version reporting by switching from the stale BuildLabEx registry value to servicing-aware build sources (CurrentBuildNumber/CurrentBuild + UBR), with a fallback to RtlGetVersion() when registry values are unavailable. This addresses issue #1407 where serviced builds were reported as their RTM base build.
Changes:
- Replace
BuildLabExusage withCurrentBuildNumber/CurrentBuildandUBR(with fallback toRtlGetVersion()build). - Add helper routines to format and select the OS build string from available sources.
- Add Windows PAL unit tests covering formatting and source-precedence behavior, including UBR-present vs UBR-missing cases.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| tests/unittests/PalTests.cpp | Adds Windows-only unit tests validating OS full version formatting and precedence/fallback behavior. |
| lib/pal/desktop/WindowsDesktopSystemInformationImpl.cpp | Updates Windows desktop OS version detection to use servicing-aware registry values (and fallback to RTL build) instead of BuildLabEx. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@GovM-MSFT from the Windows org is familiar with versioning and his team was the one that reported the issue, so I requested him to review the PR. He could not access the PR here for some reason, but was able to review a mirror I created on my fork with his personal GitHub account and has approved it. |
Summary
Fixes #1407
Validation